Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 28 Jan 2011 02:35:20 +0000 (18:35 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 28 Jan 2011 02:35:20 +0000 (18:35 -0800)
commit28842d0ae120e7b71fb75a92ce90337ef4d89e92
tree9564de9d103a6abd1d21e53752fd02a0b5764973
parent6bfc48ac4901be1c53471d1254e71091010ddd73
parent398dc9737db39f977fa2b454d6b9dd651dd3a20b
Merge from mainline.